Migrate multidex to androidx Bug: 74397601 Test: make Change-Id: Iddea6f92cc7796125cf4d1ba86cf9b7425daef72
diff --git a/build.gradle b/build.gradle index b9af213..e35adf7 100644 --- a/build.gradle +++ b/build.gradle
@@ -87,7 +87,7 @@ apply plugin: 'maven' version = rootProject.multidexVersion - group = 'com.android.support' + group = 'androidx.multidex' dist.dependsOn project.tasks.uploadArchives
diff --git a/instrumentation/AndroidManifest.xml b/instrumentation/AndroidManifest.xml index 7b9f92c..cf32396 100644 --- a/instrumentation/AndroidManifest.xml +++ b/instrumentation/AndroidManifest.xml
@@ -14,5 +14,5 @@ limitations under the License. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="android.support.multidex.instrumentation"> + package="androidx.multidex.instrumentation"> </manifest>
diff --git a/instrumentation/src/com/android/test/runner/MultiDexTestRunner.java b/instrumentation/src/com/android/test/runner/MultiDexTestRunner.java index d6931d1..02b81c8 100644 --- a/instrumentation/src/com/android/test/runner/MultiDexTestRunner.java +++ b/instrumentation/src/com/android/test/runner/MultiDexTestRunner.java
@@ -17,7 +17,7 @@ package com.android.test.runner; import android.os.Bundle; -import android.support.multidex.MultiDex; +import androidx.multidex.MultiDex; import android.test.InstrumentationTestRunner; /**
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml index 781e6a7..3a28469 100644 --- a/library/AndroidManifest.xml +++ b/library/AndroidManifest.xml
@@ -14,5 +14,5 @@ limitations under the License. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="android.support.multidex"> + package="androidx.multidex"> </manifest>
diff --git a/library/src/android/support/multidex/MultiDex.java b/library/src/androidx/multidex/MultiDex.java similarity index 99% rename from library/src/android/support/multidex/MultiDex.java rename to library/src/androidx/multidex/MultiDex.java index 562311c..69ff889 100644 --- a/library/src/android/support/multidex/MultiDex.java +++ b/library/src/androidx/multidex/MultiDex.java
@@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; import android.app.Application; import android.app.Instrumentation;
diff --git a/library/src/android/support/multidex/MultiDexApplication.java b/library/src/androidx/multidex/MultiDexApplication.java similarity index 97% rename from library/src/android/support/multidex/MultiDexApplication.java rename to library/src/androidx/multidex/MultiDexApplication.java index 8524646..4c759e3 100644 --- a/library/src/android/support/multidex/MultiDexApplication.java +++ b/library/src/androidx/multidex/MultiDexApplication.java
@@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; import android.app.Application; import android.content.Context;
diff --git a/library/src/android/support/multidex/MultiDexExtractor.java b/library/src/androidx/multidex/MultiDexExtractor.java similarity index 99% rename from library/src/android/support/multidex/MultiDexExtractor.java rename to library/src/androidx/multidex/MultiDexExtractor.java index f0fd6d4..2b96113 100644 --- a/library/src/android/support/multidex/MultiDexExtractor.java +++ b/library/src/androidx/multidex/MultiDexExtractor.java
@@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; import android.content.Context; import android.content.SharedPreferences;
diff --git a/library/src/android/support/multidex/ZipUtil.java b/library/src/androidx/multidex/ZipUtil.java similarity index 98% rename from library/src/android/support/multidex/ZipUtil.java rename to library/src/androidx/multidex/ZipUtil.java index cd518cc..fc33623 100644 --- a/library/src/android/support/multidex/ZipUtil.java +++ b/library/src/androidx/multidex/ZipUtil.java
@@ -18,7 +18,7 @@ * ZipConstants from android libcore. */ -package android.support.multidex; +package androidx.multidex; import java.io.File; import java.io.IOException;
diff --git a/library/test/src/android/support/multidex/MultiDexTest.java b/library/test/src/androidx/multidex/MultiDexTest.java similarity index 98% rename from library/test/src/android/support/multidex/MultiDexTest.java rename to library/test/src/androidx/multidex/MultiDexTest.java index 62bdc30..656b12a 100644 --- a/library/test/src/android/support/multidex/MultiDexTest.java +++ b/library/test/src/androidx/multidex/MultiDexTest.java
@@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; import org.junit.Assert; import org.junit.Test;
diff --git a/library/test/src/android/support/multidex/ZipEntryReader.java b/library/test/src/androidx/multidex/ZipEntryReader.java similarity index 98% rename from library/test/src/android/support/multidex/ZipEntryReader.java rename to library/test/src/androidx/multidex/ZipEntryReader.java index c10bec5..a16e265 100644 --- a/library/test/src/android/support/multidex/ZipEntryReader.java +++ b/library/test/src/androidx/multidex/ZipEntryReader.java
@@ -18,7 +18,7 @@ * ZipConstants from android libcore. */ -package android.support.multidex; +package androidx.multidex; import java.io.IOException; import java.nio.ByteBuffer;
diff --git a/library/test/src/android/support/multidex/ZipUtilTest.java b/library/test/src/androidx/multidex/ZipUtilTest.java similarity index 98% rename from library/test/src/android/support/multidex/ZipUtilTest.java rename to library/test/src/androidx/multidex/ZipUtilTest.java index 985d97f..39a59ac 100644 --- a/library/test/src/android/support/multidex/ZipUtilTest.java +++ b/library/test/src/androidx/multidex/ZipUtilTest.java
@@ -14,9 +14,9 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; -import android.support.multidex.ZipUtil.CentralDirectory; +import androidx.multidex.ZipUtil.CentralDirectory; import org.junit.Assert; import org.junit.BeforeClass;
diff --git a/version.gradle b/version.gradle index f9f6e1f..85e088f 100644 --- a/version.gradle +++ b/version.gradle
@@ -14,4 +14,4 @@ * limitations under the License. */ -ext.multidexVersion = '1.0.3' +ext.multidexVersion = '2.0.0'
